queue_resize_on_group with both the old and new mode, not just the new

Sun Nov  4 18:39:43 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtksizegroup.c (gtk_size_group_set_mode):
	queue_resize_on_group with both the old and new mode, not
	just the new mode. (#60171, Nicolas Setton). Also, notify
	the "mode" property.

diff --git a/ChangeLog b/ChangeLog
index 620483d825e1844dd9ff554ffd9c3396ed444111..5d4d2208217fb1fe1e86ffdba23f948a9a860241 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Nov  4 18:39:43 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksizegroup.c (gtk_size_group_set_mode): 
+       queue_resize_on_group with both the old and new mode, not
+       just the new mode. (#60171, Nicolas Setton). Also, notify
+       the "mode" property.
+       
 Sun Nov  4 16:02:08 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkwindow.[ch]: Add a function gdk_window_invalidate_maybe_recurse() 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 620483d825e1844dd9ff554ffd9c3396ed444111..5d4d2208217fb1fe1e86ffdba23f948a9a860241 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Sun Nov  4 18:39:43 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksizegroup.c (gtk_size_group_set_mode): 
+       queue_resize_on_group with both the old and new mode, not
+       just the new mode. (#60171, Nicolas Setton). Also, notify
+       the "mode" property.
+       
 Sun Nov  4 16:02:08 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkwindow.[ch]: Add a function gdk_window_invalidate_maybe_recurse() 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 620483d825e1844dd9ff554ffd9c3396ed444111..5d4d2208217fb1fe1e86ffdba23f948a9a860241 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Sun Nov  4 18:39:43 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksizegroup.c (gtk_size_group_set_mode): 
+       queue_resize_on_group with both the old and new mode, not
+       just the new mode. (#60171, Nicolas Setton). Also, notify
+       the "mode" property.
+       
 Sun Nov  4 16:02:08 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkwindow.[ch]: Add a function gdk_window_invalidate_maybe_recurse() 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 620483d825e1844dd9ff554ffd9c3396ed444111..5d4d2208217fb1fe1e86ffdba23f948a9a860241 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Sun Nov  4 18:39:43 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksizegroup.c (gtk_size_group_set_mode): 
+       queue_resize_on_group with both the old and new mode, not
+       just the new mode. (#60171, Nicolas Setton). Also, notify
+       the "mode" property.
+       
 Sun Nov  4 16:02:08 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkwindow.[ch]: Add a function gdk_window_invalidate_maybe_recurse() 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 620483d825e1844dd9ff554ffd9c3396ed444111..5d4d2208217fb1fe1e86ffdba23f948a9a860241 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Sun Nov  4 18:39:43 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksizegroup.c (gtk_size_group_set_mode): 
+       queue_resize_on_group with both the old and new mode, not
+       just the new mode. (#60171, Nicolas Setton). Also, notify
+       the "mode" property.
+       
 Sun Nov  4 16:02:08 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkwindow.[ch]: Add a function gdk_window_invalidate_maybe_recurse() 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 620483d825e1844dd9ff554ffd9c3396ed444111..5d4d2208217fb1fe1e86ffdba23f948a9a860241 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Sun Nov  4 18:39:43 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksizegroup.c (gtk_size_group_set_mode): 
+       queue_resize_on_group with both the old and new mode, not
+       just the new mode. (#60171, Nicolas Setton). Also, notify
+       the "mode" property.
+       
 Sun Nov  4 16:02:08 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkwindow.[ch]: Add a function gdk_window_invalidate_maybe_recurse() 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 620483d825e1844dd9ff554ffd9c3396ed444111..5d4d2208217fb1fe1e86ffdba23f948a9a860241 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Sun Nov  4 18:39:43 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksizegroup.c (gtk_size_group_set_mode): 
+       queue_resize_on_group with both the old and new mode, not
+       just the new mode. (#60171, Nicolas Setton). Also, notify
+       the "mode" property.
+       
 Sun Nov  4 16:02:08 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkwindow.[ch]: Add a function gdk_window_invalidate_maybe_recurse() 

diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
index 2ceca3c4d8a148afa24100f5f1db1d3644e8cb19..e0f28b020a149d3bfcb9e4c50947a0777b0049d3 100644 (file)
--- a/gtk/gtksizegroup.c
+++ b/gtk/gtksizegroup.c
@@ -358,8 +358,13 @@ gtk_size_group_set_mode (GtkSizeGroup     *size_group,
 
   if (size_group->mode != mode)
     {
+      if (size_group->mode != GTK_SIZE_GROUP_NONE)
+       queue_resize_on_group (size_group);
       size_group->mode = mode;
-      queue_resize_on_group (size_group);
+      if (size_group->mode != GTK_SIZE_GROUP_NONE)
+       queue_resize_on_group (size_group);
+
+      g_object_notify (G_OBJECT (size_group), "mode");
     }
 }